Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support DXR in wgpu-hal & naga. #6777

Open
wants to merge 44 commits into
base: trunk
Choose a base branch
from
Open

Support DXR in wgpu-hal & naga. #6777

wants to merge 44 commits into from

Conversation

Vecvec
Copy link
Contributor

@Vecvec Vecvec commented Dec 18, 2024 •
edited
Loading

Connections
Might provide alternatives for #6727?

Description
This adds support for DXR in wgpu-hal. Also removes an unnecessary feature requirement from ray_cube_compute as this was preventing it from running on DX12. Also adds support for HLSL raytracing because naga didn't have that either.

Testing
this only extends feature support to dx12 so all previous rt tests work.

Checklist

  • Run cargo fmt.
  • Run taplo format.
  • Run cargo clippy. If applicable, add:
    • [n/a] --target wasm32-unknown-unknown
    • [n/a] --target wasm32-unknown-emscripten
  • Run cargo xtask test to run tests.
  • Add change to CHANGELOG.md. See simple instructions inside file.

Vecvec added 30 commits September 9, 2024 17:19
@Vecvec
implement device calls
4be11ec
@Vecvec
implement todo and fmt
647ddd0
@Vecvec
properly implement todo and fix other clippy errors
0d0b2ab
@Vecvec
don't use buffers in getting build sizes
f91a482
@Vecvec
fmt
951d437
@Vecvec
implement commands
f017080
@Vecvec
fix errors
23cc3a1
@Vecvec
implement hlsl out
6a2f362
@Vecvec
fix clippy warnings
7e2fc34
@Vecvec
fix CI errors
2350e04
@Vecvec
fix CI errors #2
4bdf0ed
@Vecvec
fix CI errors #3
1750afb
@Vecvec
fix CI errors #4
45ec097
@Vecvec
fix CI errors #5
275d082
@Vecvec
check for sm 6.5
3cc9801
@Vecvec
implement rest of direct x ray queries
dd99a08
@Vecvec
fix issues with ray-traced triangle
499fa9b
@Vecvec
clippy & fmt
4f762e0
@Vecvec
Merge remote-tracking branch 'refs/remotes/gfx-rs/trunk' into dx-ray-…
f92221d 
…tracing
@Vecvec
Merge remote-tracking branch 'refs/remotes/gfx-rs/trunk' into dx-ray-…
0877129 
…tracing

# Conflicts:
#	naga/src/back/hlsl/writer.rs
#	wgpu-hal/src/dx12/device.rs
@Vecvec
fix merge
7576bbe
@Vecvec
fix build
44f73e6
@Vecvec
remove unused import
02c8699
@Vecvec
don't use `Direct3D12::D3D12_RESOURCE_FLAG_RAYTRACING_ACCELERATION_ST…
19caada 
…RUCTURE` as we don't yet support enhanced barriers for acceleration structures
@Vecvec
support candidate intersections
2493f04
@Vecvec
write out values of constants, not their wgsl names.
3810051
@Vecvec
format
d6a4fee
@Vecvec
Merge remote-tracking branch 'refs/remotes/gfx-rs/trunk' into dx-ray-…
ef1ffd7 
…tracing
@Vecvec
fix merge
8a88223
@Vecvec
remove println!
f74a6da
@Vecvec Vecvec requested review from a team as code owners December 18, 2024 01:17
@Vecvec Vecvec mentioned this pull request Dec 18, 2024
Open
22 tasks
@Elabajaba
Copy link
Contributor

Elabajaba commented Dec 18, 2024 •
edited
Loading

I ran the tests for this and it doesn't appear to be working properly? (6800xt/RDNA2 has RT support, I ran $env:WGPU_BACKEND="dx12" then cargo xtask test -- ray_tracing)

        PASS [   0.076s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_build::unbuilt_blas
        PASS [   0.075s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::scene::acceleration_structure_build_no_index
        PASS [   0.075s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_build::out_of_order_as_build_use
        PASS [   0.076s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_build::out_of_order_as_build
        PASS [   0.089s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_use_after_free::acceleration_structure_use_after_free
        PASS [   0.089s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_build::out_of_order_as_build
        PASS [   0.088s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::scene::acceleration_structure_build_with_index
        PASS [   0.088s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::scene::acceleration_structure_build_no_index
        PASS [   0.088s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_build::unbuilt_blas
        PASS [   0.088s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_build::out_of_order_as_build_use
        PASS [   0.100s] wgpu-test::wgpu-test [Unsupported: Features] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_build::empty_build
        PASS [   0.095s] wgpu-test::wgpu-test [Unsupported: Features] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_build::empty_build
        PASS [   0.100s] wgpu-test::wgpu-test [Unsupported: Features] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_create::blas_invalid_vertex_format
        PASS [   0.095s] wgpu-test::wgpu-test [Unsupported: Features] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_create::blas_mismatched_index
        PASS [   0.101s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::scene::acceleration_structure_build_with_index
        PASS [   0.103s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_use_after_free::acceleration_structure_use_after_free
        PASS [   0.106s] wgpu-test::wgpu-test [Unsupported: Features] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_create::blas_mismatched_index
        PASS [   0.110s] wgpu-test::wgpu-test [Unsupported: Features] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_create::blas_invalid_vertex_format

edit: This is probably #6728, I'll try reverting that and see if it works.

edit2: Nope, reverted that and it's now saying [Unsupported: Features] for all of the tests.

edit3: Looks like you need to set the WGPU_DX12_COMPILER environment variable to either dxc or static-dxc for it to work, as it otherwise defaults to FXC. All the ray_tracing tests passed once I set it to either dxc (with the .dlls in my wgpu root dir) or static-dxc.

@cwfitzgerald
Copy link
Member

Looks like you need to set the WGPU_DX12_COMPILER environment variable to either dxc or static-dxc for it to work, as it otherwise defaults to FXC. All the ray_tracing tests passed once I set it to either dxc (with the .dlls in my wgpu root dir) or static-dxc.

This should now default to static-dxc after #6730

@Vecvec
Copy link
Contributor Author

Vecvec commented Dec 18, 2024 •
edited
Loading

All the ray_tracing tests passed once I set it to either dxc (with the .dlls in my wgpu root dir) or static-dxc.

Since that's on a AMD GPU, that means that this probably does provide an alternative (and may also point to the issue being a wgpu bug vs a AMD bug)

Edit: I'm not sure what GPU generations were being affected though.

@cwfitzgerald
Copy link
Member

Same, my 7800xtx passes all tests

@cwfitzgerald
Copy link
Member

Both testing issues fixed in #6781 and #6782

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jimblandy jimblandy

@cwfitzgerald cwfitzgerald

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Vecvec @Elabajaba @cwfitzgerald @jimblandy